Added Some Refactoring changes and other