Minor change of method name
Remove comments