Yesterday
Minor code cleanup