more const correctness and method naming conventions