A quite litte refactor