MINOR code layout.