Removed comments and code ver2