Removed unused import.
Code formatting tweaks.