Minor coding improvements using hlint