simple templating and code formatting adjustments