cleanup and directive seperation for tweet