Just some cosmetic work