Implementing DI, clean up