Update the code according to standards