Fix grammar and structure