Clean up and fix repo