Refactor and standardize variable naming
More restucturing into agnostic objects