code clean and typo changes