Cleaning up imports and output