Fix erratic white space, fold constants.