Tidied up some code, removed some references to the original project.