minor re-arrange