Refactored and added content