Clean up models and add convenience accessor