WIP: Refactor if statement curly braces and spacing