Simplify and Improve readability on some conditions