rafactored Startup class