cleanup code for further refactorization