Add some description and clear redundant code