Cleanup with some tweaks to notify adapter of data change