Refactored the code to remove confusing hyphens
21 files changed