Adds lots (LOTS) of style cleanup