Refact. First step.