Stylistic changes
Lots of improvements