modify comment and code format