Cleanup some comments and tweet structure