Handle self closing tags
Refactor to clean up code

   * Remove indent
   * Remove unused default values
   * Remove some ugliness