Remove html suffix from partials urls.
Small rewrites for more compact code.