Tidied setup