6th push

cleaned up some code