chore(*): some modifications implemented