Not sure it could be removed but I did some refactoring...