A little more documentation and indent cleanup