Finished up and made some tweaks to the code
Tweaks to code