Clean up
Add recentering