cleaned-up Startup class