Removed unused import.
Reordered methods.