a bit of cleanup and reording