cleanup, updated Application, using G4\Constants package