Complete models initialize and improve var naming