refactor #1
Merge pull request #1 from mats990/refactor

refactor #1