style thread a little, slight refactor