more const. also reremove that block for a reason