fix namespace and comments