Cleaning up some HEREDOCS