changed feed_key and cleaned up code