Add some minor stylistic changes