Updating to newer rust conventions