Remove a few require onces
fix coding & whitespace issues
fix unterminated spans & empty ts