stylistic changes and a bug fix