[refactor] simplified, dependency free