Improved doc and formating