Continue to work on code refactor