minro bugfix and formatting