Minor changes

Changed some comments and method names