More quick code cleanup