Refactorization, better class names