Cleaned up code

Reorganizing messes and Removing redundancies/old code
Changed and added options for faction names