Clean up and commenting code.