Finished factorizing, hopefully.

Signed-off-by: Martin Raspaud <martin.raspaud@smhi.se>