clean up and closer to final