Bit of clean up on whodunit