Bugfix and formatted