Small stylistic changes and a bugfix

See title