Simplify code and remove useless comment