Refactor classing