Added some comments and delete trash