Fixed code style issues to match the guide