Cleanup and added documentation

Updated