Applied recomennded modifications.