Refactor code to be more descriptive