Update: incremental changes/cleanup