Added some comments, changed keywords