Clean up and simplify