style/performance updates