Name refactoring
Name refactoring, const correctness, minor changes, comments