Fixing first person and one-liner