Refactor leftovers