use proper scope, throw a nice exception, correct delimiters