Mild code cleanup