change class reference
tidy up imports