Tidied up the gem source