OT: Need some advice/help on this smell issue