A few small changes

Names; formatting