More twitter related fixes
Indentation fixes
More indentation fixes
Indentation fixes and other stuff