Remove unused import; better function names