Refactor all things. art 2