Refactor just a little bit.