Improve readability of variable declarations