Revert "Performance increase and ease cp integration."

This reverts commit c5cdd988c23465958f03aa5c7600b9af0365c131.
Whitespace.
Changed engine internals to increase performance and ease integration with CP.