Even more code consistency