Fix line ending and after keyword