Refactor ... :)