Minor bugfix and formatting