Comments + cleanup.