cleaned up pillar_handler some