Feature/code quality