Variable name clarification.
Added changes from implementation.