Implemented suggestions made by hlint