Add some comment, removed useless logs