[CLEANUP] minor cleanup
[REFACTORING] refactored some code into a static class