Some refactoring

And changes to normal priority