Merge "Small JS code cleanup." into sc-dev