shared_ptr returns instead of references. Formatting fixes.