Reconstruction of the class to reduce coupling