Adds more info and fix style issue