bugfix and formatting

bugfix and formatting