minor modifications inside helper classes