Fix missing else braces from @JelloRanger's changes

- Add missing braces for else block and fix tabbing to properly execute
necessary methods for each condition
- Add comments to explain if block statements