Reorganizing Setup functions.