Tweaked code readability