Reorganized, some clean up...