Change make_url to makeUrl to satisfy PSR-1. Merge attribute service into user service.