Add more diagnostic output
Change code style