Refactor Classes per Thomas' request