Refactoring methods in Senses module