Tidied up source files.