Reorganize the way I do it, cleanup.