Refactoring completely done!