Tidy-up and trying to create jenkins