neatening up and some suggestions