Final conversion to spaces from tabs and small cleanup