Stylistic revision, bugfix