Refactor Class