Clean up inline documentation
more inline doc cleanup & better get_template