Improved naming of variables.
Added a couply of considerations.