cleaned up application helper