Simplify and comment