commenting + cleanup