Some refactoring
Adding a refactor which might not be the final form