[UPDATE] minor non-functional updates