* [Code Style] Some code style changes Minor changes to make some code Swiftier * Fixes for PR feedback