small refactor to the latest commit