refactor variable casing