some minor syntax changes