Working on overall improving the code so it's easier to digest

Working on overall improving the code so it's easier to digest #81