initial commit
clean up code