More changes for style and documentations