Little refactor, one todo :-)