Quick pass to clean out the unneeded and add a little copy