Simplify
Move comment