a first in a whirlwind of code cleaning