Clean up and simplify further