test a little, refactor a little.... (2)