First pass at fixing unexpected identifier error