Tidied up source code and repository