Tidied up, removed console.logs
Merge