Minor cleanups on .ts files