Code readability changes
Code readability changes