Fix formatting&&comments