fix: comments, extra white spaces