Cleanup and Comments on code.