Refactor Classes