Refactor pushing of content