Added const to methods that should have it