Cleaned up models, made 2nd first & last name fields optional