rename and remove unused import and minor changes