Removed unused import
Comment cleanup