Clean up and add option to override