Some minor cleanup /vrutberg