Refactor code, again...