QA - removed code style violations