Applying Hlint suggestions