Style cleanups

     * Remove some postfix if
     * Remove some 'return ()'
     * Remove some extraneous semicolons