Cleanup

1. Changing /* */ to ///
2. Using var instead of full type