Refactor following your comments on naming convention