Prepared for refactoring