Cleanup imports
#20, #21