Simplify and cleanup