refactored a few extra ( )