cleaned up models and fields