Cleaned up imports and doc