Added some comments and removed new lines