Code cleanup and add todos for extractions.