refactor 13