Reorganized a feww methods.