Stylistic changes, more tests