Little Refactoring, some fix & add queue for file