Cleanup; Added documentation