clean code. Add emailfeed