Bugfix and style