moved code to separate function