Pepper Improve.hs with INLINE pragmas
Minor style improvements