Updating the code to be a bit more logical
Cleaning up a bit
slight tweaks
part-1