Formatting and minor code update.