[REFACTOR] Clean up