Refactor | Beverly | Make list general in App