More Cleanup, Strings/Bools/Arrays/Integers are now organized,