Minor changes before branch

Minor aesthetic changes before branching for minimization.