refactoring methods.
removing useless import.