Minor Application cleanup