Some minor code formatting and commenting.