Code comments improvements

- Some comments improvements and typo fix