cleanup
hlint cleanup
more cleanup