Cleanup & docs