rhbz1002774 - minor refactor