cleaned up some code
changed version