Clean up to take advantage of the new decoder method