incremental style improvements