Stylistic changes/readability improvements