Ordered import
Fixed typo
Fixed spaces
Several little style fixes