simplify and clean up comments