Cosmetic updates to form