cleaning + refactoring