fix comments and namespace