Cleaned up imports and spacing a bit