indentation and NULL comparison repairs in Avatar