Refactor, rename, add twitter fetching