Made normal nodes show up by default again. Minor code cleanup.