Tidied up Capfile