Make code more dynamic