Cleaning up petViewController and other minor changes