refactoring: less parenthesis