Clean up and pass data review