minor syntax improvements