Commentary + cleanup