IMPROVED: doc comments