Fixing code style violations