tidy up expressions and rendering