Tidied client code!