Fixed suggestions made by hlint