WIP: cleaning up analysis