Named all functions and removed unused import