Remove needless parantheses
Tweak up the style further