refa(PR:#27): refac PR #27