Refactored and changed content