Removed unnecessary i += 1 statements