Massive style cleanup