Clean up code and docs...