Cleaning up const