Cleaning up templates and moving the onEnter directive to the base
Alchemy repository and using the implementation that exists there.