Feature/style guide corrections subtask1