Refaktorering. Forenklinger.