cleaned up code, and git directory