fix CR feedback
useless semicolon removal
useless semicolon removal