Little code cleanup 2.