incremental content, tidy up