This Commit Takes Care Of issue #1. Cleaned up code from last pull request. Changed variable names so they are a little more understandable ..