Code cleanup for application group parser