Cleanup, indentation fixes, section templating