refactoring / cleaning