make role/coredb more readable

sshh..don't call it a lint change:)

Change-Id: I6a6b0a410a395650843e6b468547169d533d31a1