removed some codesmell, refs #9017