Minor changes in Documentation + code cleanup