little refactor for @BOOtak