structure improved, jekyll-ish