I try hard these days to stick to Gio's advice of making the tiniest change possible when refactoring. I used to move lots of stuff around at once and get into some bad messes.