Minor changes based on hlint suggestions