Add some comments and remove prints on code