[mr2785] Some code style and improvements for pets