Renamed class to something a little less … ambiguous :P
Also a little fix to make sure hex always comes out uppercase