Cleaned up source code.