minor re-organize