Add char protection, remove ending line return