Code clean up and removed text typos in comments

Code clean up and removed text typos in comments