Cleanup based on HLint suggestions