simplify and comment