Tidy up imports
Change println to logging