moved duplicated code to separate function