[@Holy Soldier], I have made those changes and attempted to simplify them more throughout. Some were renamed as I replaced them altogether to make them more conventional and less complex.