Some little re-arrangement.