Fixing Twitter aside and some cleanup