Fixed #7; cleaned preprocessStage(), define()