Style / refactoring / readability