neatening up a bit