clean up indentation and remove unnecessary <td>