Cleaned up repo and some code