Little refactor...