Initial commit (only done some code clean up).