Updated TypeScript to be more JS idiomatic