Make code more consistent