some additional irrelevant changes

additional changes from @jnewblanc