Just some refactoring

We can chat in this PR if you have questions