Cleanup
Hlint editing and remove unnecessary loop