Fix compilation warning & minor reformatting.