Tidied up project a little