Started: refactoring