Clean up stuff hlint complains about