styles; clean up models; misc clean up
styles; clean up models; misc clean up