cleaning up imports and comments