ticket:3. Some syntax errors fixed