Fixed remove comment
Improved import
Minor fixes