Applied refacto to comments as well