Clean it up, part 2/999