Cleaned up the engine