A little cleanup and arg infos on bucket