Clarify comment
Refactoring to avoid code duplication
Convert uppercase text into more readable title case