fix comments and identation