Perform final cleanup of detect_kippo

Take a close look at the changes, digest them, and merge the PR when you're ready!