Change settings pattern and cleanup from review.