Ted has no style

Various style improvements