variables fix after review