Fixed code formatting issues

Synced master with development