More docs and cleanup