Content helper class code refactored