CRUISE: Add some comments, remove some optional brackets
CRUISE: Some minor rework in script handler