Made some stuff static