cleaned up some stuff with hlint