Refactor for cleanliness, but fix capitalization.