Refactoring sandbox. AH-195