Made things prettier

Couple of bits and bobs