Merge in mtwitter style, move things around

Also remove ?: ternary bullshit