tidied up the layout a bit
add readonly streams