Made Final Adjustments

I made the final adjustments and corrected some of my code that not
being used. I also changed the naming convention on some of my
functions so that they are easier to understand