Consolidated executed/recorded (Change) + more code cleanup