fix comments and typos
fix issues and recommendations based on @zuki @lap82 comments