Refactoring after Sasha comment