Lot of style cleanup
Put it out of debug mode