Refactor 8b3dfaa651fb6f178