update documentation + "clean" a bit the class