Simplified add_model_methods
Line length fixes