Clean up documentation, code