COMPLETE TRANSLATION
- Finished refactoring
- Many clean-ups