Incorporated suggested refactor