Slightly improved definitions
Fixed syntax errors