Update Comments and style