refactor 19