Syntax improvements
Rubocop-inspired refactor