further refactoring (messing with parens, assignments)