Improved doc and cleaning