Style

Bugfix included.