Initial PSO Setup
Minor changes to clean up code