Moved twitter functions; Reformatted code
More cleanup