Some code restyling. New outputStream property.