refactoring - cleanup