Some heavy cleanup in FeedItem.java
A bit more cleanup in order to have a working tree