Removed unnecessary <g>'s