comments + cleanup