Some Cosmetic Stuff

Hopefully you are okay with this...