Little bit of refactor