Removed excessive refactoring from Types.hs (And Usages)