Code refactor, again.