tidied up imports and install process