Fixed code style issues