More pixy comments and cleanup