refactor all apps except points