Code clean up.
Changed naming strategy for all unbounded variables.