[Spec] Fix template
[Hooks] Minor clean up.