Some tidying
Added plain text type