Major cleanup
CR fix
CR fix
CR fix
Merge pull request #3 from ArcBees/spg_major_cleanup

Major cleanup