Stylistic changes to code