Feature/code style