Made some stuff non mutable