Changed includes and stylistical changes