Small refactorings(some suggested by ghc_mod)