Made things more Javascript-y