Make nudnik friendlier and fix the indenting mess

This is the actual change ^^.  Rest is reindentation.