cosmetic and syntactic fixes