Major stylistic improvements
More fixes