refs #7 Fix spec
refs #7 Remove unnecessary magic comments