Updated comments and updated syntax