Code cleanup

Perform code cleanup suggested by hlint