fix compilation error & cleaned up imports