Cleaned up source files a bit.