Implement comments
Replace int64 type with int type