OCD kicking in

Restructured if statements
Minor Changes
Prefab changed..