Prepare #3

Clean up and add notes to answer #3