Simplify down the petbar code