stylistic changes + new test