cleaned up code more
commit