Added some comments and suggestions