Cleaning up and adding more code
Added another two variables