Tweaked indentation and cleaned up formatting
Removed some extraneous brackets