Minor aesthetic changes

Vesper and I reviewed changes. Take a look!