Clean-up

Cleaning up from previous activity and updating documentation