Fix shiftwidths and add logs