Improved with Hlint :)