cleaning up for for refactoring