Add some DOC string in the constructor and some format issues