Changes to increase readability