Rename var
Better handling of - in multiline situations
Refactor
Refactor self.t_value
Pass functions through rather than wrapping
Push more logic into stream
Minor simplification