Cleanup and added Twitter API vars