The following is a matter of taste, I'm not sure this reads any cleaner than what you had before, but you were looking for suggestions on how it could be changed, so here is one possibility.