cleaned up some things that were messy