Don't pass credentials into entities.
Address some of golint's concerns.