Finally tidied up the spot I make stuff