App Class Main method cleaned