Cleaned up repo considerably