+ somewhat cleaned up the engine