Code cleanups

Authored by dfaure on Jul 14 2017, 3:49 PM.