Grammar: Code cleaned