Reorganized Brackets

Fixed brackets to be on same line as if's and else's.