Shameless code cleanup.. Zzz