Clean up to re-work