Cleared up

credits to https://github.com/Ractis for his Utils library