Made new code consistent with the old code idioms