new feelings entry code cleaning