Minor code changes; Explicit docs