Minor cleaning and adding of comments