Remove unused import
Minor loops clean up