cleaned up, ready to submit