Clean up documentation and imports