* fix over 80 chars line and remove unused import.