Refactored the Engine_helper module. It's a bit less messy now.