App calenup and refactor