Improved readability of code