Code clean up and manually tested
Documentation updates