Comments + cleanup