james | continued refactoring
james | removed redundant parens