Refactoring on feeding controller / model