Refactor of Scenting and Smelling to simplify types