Add comment
Simplify code