Typo correction and more elegance presentation