Small comments + cleanup