initial commit
cleaned up code