Code refactorization
Feed editing