Cleaning up for 3rd edition