More simplify and cleanup