fixed up more indenting derps from original code