refactored content.rb