Tightened up class access, tidied up imports