Comment and naming improvements and clarifications