Some style modifications
Even more adjustments