Added stylistic improvements