Small Cleanup & Updates from Galaxyfreak/NiharG