Small refactor :-)