Improved Doc Comments