Added some more comments and removed unused dependency