Add comments, relocate cleanup.