Clean up
Refactoring
Mode todo