Cleanup
Added twitter cards support