Refactor to easier remember