test a little, refactor a little....