Consolidate methods into more cohesive classes