Clean up and simplification