Simplify and clean up