Refactored some content