Tidied up the project