simplification / refactoring