Refactor AUX code to remove more pork