APOLLO-3003: minor fixes: DocBlocks and var naming