This change reflects further corrections and suggestions from @ajarmouni-st. Signed-off-by: Pisit Sawangvonganan <pisit@ndrsolution.com>