Cleaned up whitespace and bracketing

Removed excess whitespace and repositioned brackets.