Improved doc comments