Refactoring some methods in Senses module