Refactoring Code
Updated Documentation

Amends and updates to documentation to reflect new changes