fixed format

format and comments