Added twitter support and code cleanup
Added twitter