Updated some lines in code