Improvements to code readability