hard refacto`ring