small improvement and formatting