Cleaned up whitespace and bracketing

Removed whitespace and repositioned brackets