App picker:code cleanup