Removing use of const keyword