Code formatting + minor enhancement.