Update comments; format code