- Refactored the code, cleanup