A lot of Refactoring of Code  is made..