Updated documentation according to comments