[Refactored] pet tricks into a single method

Change-Id: Id3d7ccd68ff3058a39dc30dad6ee7488eaf59b80