Optimize imports
Fixed #34