Code cleanup.
Code cleanup
Settings change.
Code cleanup.
Added Lack of Cohesion code review.