Remove unnecessary parentheses
Make if-statements showable
Tweak layout
Add function clause to reduce statements