Code cleanups and fade effect, refs #5193