Removed unused import.
Fixed a few small things that bothered me.