another retrospective + some cleanup