Tidied up project
Merged tidied code