[#547] Code cleanups