Improve readability. Reduce code.