- changed error message to match expected test result
- coding style
- support both definition styles