Clean up models, add username field.