Some changes for improving readablity.