Refactor Box