Refactoring
Changes