A few tidy ups in plan handler
Add type dec. & :lipstick:
Type def.
:lipstick: