Removed use of const