Simplify table rendering by generating a partial
Tweak coding standards a bit