Fix bug, cleanup empty style attributes