Refactor leftovers.