I too find the code a bit unwieldy when examine commands are in different places, as when a game project gets big I can never remember where I've put things (I end up keeping a notepad file with the entire code open so that I can Ctrl+F). As such, what I've been trying to do is keep everything under on_command and in alphabetical order, despite the fact that it would be a lot easier just to use examine_message (this also helps if I later decide that a particular object IS going to require conditional logic).