Clean up
Refactor
Refactor
Refactor
Refactor
Refactor
Fix bugs, refactor
Refactor
Refactor
Refactor
Refactor
Fix a bug
Refactor
Refactor