Adjusted doc comments and usage of constant during variable access.