Small updates to make code nicer.