Huge Cleanup

A huge clean up at my CombinerCore.class