Clean up git
Fix refactoring error