Tidied up and added tidy config