Refactor of code, cleanup, remove all print lines that are no longer used. Replaced all the hard coded values