MOre work on prettification of hooky-ness.

 Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>