syntactical improvements

no functionality added/changed