two minor commits to improve flow