Added more cosmetic stuff