Improve readability of code