Minor update: making code easier to read.