Application helper refactor...