clean up, style updates
conflict