Improved readability of code, no functional changes