Make nudnik friendlier and fix the indenting mess