removed some code style violations