Changing tweet setup, minor refactoring