Refactor a bit more last commit.