Cleanup of whitespace and brackets

Removed whitespace and repositioned brackets