More Stylistic changes