Minimal stylistic changes to the code