Improve display tweet and cleanup the code