Added some comments to files and removed unused lines