Refactor: code cleanup
Refactor: code cleanup