Perhanasti refaktorointia.