Refactoring
Changed title