If you prefer leaving this PR as is, that is fine, I am slowly continuing the cleanup of #23 this week and will fix it later.