Refactor | Beverly | extract methods to clean up App