* minor refctoring